Auto merge of #1406 - alexcrichton:issue-1404, r=wycats

When loading targets to compile, be sure to use the targets from the package
that's being passed down to the compilation step, not the one that was passed in
which is overridden.

Closes #1404